Get the foreground color from 'text', nor 'base'. (#57568)

Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_set_attributes_from_style):
	Get the foreground color from 'text', nor 'base'. (#57568)

diff --git a/ChangeLog b/ChangeLog
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1c8daeae69cdfd15779f08c2ff0cac07ea1a55a5..d3fe2970c2a2f2c9d93bb26ef96220b423e2bdba 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jul 18 19:51:45 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_attributes_from_style): 
+       Get the foreground color from 'text', nor 'base'. (#57568)
+
 Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/*.c: Patch from Matthias Clasen to remove remove

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 53ba578fc6d02357b343c023a372541d8abc36da..ce4a6493cfd426de3f90d4e371d0e9b79b23f77d 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4358,7 +4358,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
                                          GtkStyle           *style)
 {
   values->appearance.bg_color = style->base[GTK_STATE_NORMAL];
-  values->appearance.fg_color = style->fg[GTK_STATE_NORMAL];
+  values->appearance.fg_color = style->text[GTK_STATE_NORMAL];
 
   if (values->font.family_name)
     g_free (values->font.family_name);